Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 8 Apr 2016 16:06:36 +0000 (17:06 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 8 Apr 2016 16:06:36 +0000 (17:06 +0100)

Trivial merge